Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2011 17:33:16 +0000 (10:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2011 17:33:16 +0000 (10:33 -0700)
commit2f9b57b9435540915748fd5a34849a8b5927bd96
tree884ad4a7c6dd4f94b1e290fe8f505e6b74027cc1
parentfb7213352303c8d456957f268257604580cfc77c
parentbe1bb55ab46e8bf325fe7bdfa70c5ef1523e9cd4
Merge from mainline.
ChangeLog